Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport PR #2718 to release/v1.7 for Fix bind DOCKER_OPTS option #2719

Merged

Conversation

vankichi
Copy link
Contributor

@vankichi vankichi commented Oct 25, 2024

Description

SSIA

Related Issue

Versions

  • Vald Version: v1.7.13
  • Go Version: v1.23.2
  • Rust Version: v1.81.0
  • Docker Version: v27.3.1
  • Kubernetes Version: v1.31.1
  • Helm Version: v3.16.2
  • NGT Version: v2.2.4
  • Faiss Version: v1.9.0

Checklist

Special notes for your reviewer

Summary by CodeRabbit

  • New Features

    • Enhanced flexibility in Docker build options by allowing additional arguments to be appended without overwriting existing settings.
    • Updated build arguments for specific targets to include ZLIB_VERSION and HDF5_VERSION.
  • Bug Fixes

    • Corrected the versioning reference from HDF5_VERSION to HDF4_VERSION in relevant build targets.

* 🐛 Fix bind DOCKER_OPTS option

Signed-off-by: vankichi <kyukawa315@gmail.com>

* Fix

---------

Signed-off-by: vankichi <kyukawa315@gmail.com>
Copy link
Contributor

coderabbitai bot commented Oct 25, 2024

Caution

Review failed

The pull request is closed.

📝 Walkthrough
📝 Walkthrough

Walkthrough

The changes in this pull request focus on modifying the Makefile.d/docker.mk to enhance how DOCKER_OPTS are constructed for specific Docker build targets. The updates involve replacing direct assignments with conditional expressions that append new build arguments. Targets affected include docker/build/loadtest, docker/build/benchmark-job, and docker/build/example-client. This allows for greater flexibility in managing build options.

Changes

File Change Summary
Makefile.d/docker.mk Updated construction of DOCKER_OPTS for targets: docker/build/loadtest, docker/build/benchmark-job, docker/build/example-client.

Possibly related PRs

Suggested labels

type/refactoring

Suggested reviewers

  • kpango

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

cloudflare-workers-and-pages bot commented Oct 25, 2024

Deploying vald with  Cloudflare Pages  Cloudflare Pages

Latest commit: 320efb4
Status: ✅  Deploy successful!
Preview URL: https://5d750b3e.vald.pages.dev
Branch Preview URL: https://backport-release-v1-7-ci-mak-2fai.vald.pages.dev

View logs

@vdaas-ci
Copy link
Collaborator

[CHATOPS:HELP] ChatOps commands.

  • 🙆‍♀️ /approve - approve
  • 🍱 /format - format codes and add licenses
  • /gen-test - generate test codes
  • 🏷️ /label - add labels
  • 🔚 2️⃣ 🔚 /label actions/e2e-deploy - run E2E deploy & integration test

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 1dd93e8 and 51610d8.

📒 Files selected for processing (1)
  • Makefile.d/docker.mk (3 hunks)
🔇 Additional comments (1)
Makefile.d/docker.mk (1)

307-307: Review the DOCKER_OPTS binding fix

The changes use shell parameter expansion ${DOCKER_OPTS:+${DOCKER_OPTS}} to properly append build arguments to existing DOCKER_OPTS. This is a good practice as it:

  1. Preserves any existing DOCKER_OPTS values
  2. Handles the case when DOCKER_OPTS is unset or empty

Also applies to: 375-375, 398-398

Makefile.d/docker.mk Outdated Show resolved Hide resolved
Makefile.d/docker.mk Outdated Show resolved Hide resolved
Makefile.d/docker.mk Outdated Show resolved Hide resolved
Signed-off-by: Kiichiro YUKAWA <kyukawa315@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants